Merge branch 'release/1.9.x'

dtool/src/cppparser/cppPreprocessor.cxx

@@ -983,13 +983,14 @@ skip_whitespace(int c) {
 ////////////////////////////////////////////////////////////////////
 int CPPPreprocessor::
 skip_comment(int c) {
-  if (c == '/') {
+  while (c == '/') {
     int next_c = get();
     if (next_c == '*') {
       _last_cpp_comment = false;
       c = skip_c_comment(get());
     } else if (next_c == '/') {
       c = skip_cpp_comment(get());
+      break;
     } else {
       _last_cpp_comment = false;
       unget(next_c);

dtool/src/dtoolbase/pallocator.T

@@ -56,7 +56,7 @@ allocate(TYPENAME pallocator_array<Type>::size_type n, TYPENAME allocator<void>:
   *((size_t *)ptr) = alloc_size;
   return (TYPENAME pallocator_array<Type>::pointer)(((char *)ptr) + header_reserved_bytes);
 #else
-  return (TYPENAME pallocator_array<Type>::pointer)malloc(n * sizeof(Type));
+  return (TYPENAME pallocator_array<Type>::pointer)PANDA_MALLOC_ARRAY(n * sizeof(Type));
 #endif  // DO_MEMORY_USAGE
 }
 
@@ -72,6 +72,6 @@ deallocate(TYPENAME pallocator_array<Type>::pointer p, TYPENAME pallocator_array
   _type_handle.dec_memory_usage(TypeHandle::MC_array, alloc_size);
   PANDA_FREE_ARRAY(ptr);
 #else
-  free(p);
+  PANDA_FREE_ARRAY(p);
 #endif  // DO_MEMORY_USAGE
 }

panda/src/tinydisplay/td_light.cxx

@@ -127,9 +127,9 @@ void gl_shade_vertex(GLContext *c,GLVertex *v)
     B+=att * lB;
   }
 
-  v->color.v[0]=clampf(R,0,1);
-  v->color.v[1]=clampf(G,0,1);
-  v->color.v[2]=clampf(B,0,1);
-  v->color.v[3]=A;
+  v->color.v[0]=clampf(R*v->color.v[0],0,1);
+  v->color.v[1]=clampf(G*v->color.v[1],0,1);
+  v->color.v[2]=clampf(B*v->color.v[2],0,1);
+  v->color.v[3]=clampf(A*v->color.v[3],0,1);
 }
 

panda/src/tinydisplay/tinyXGraphicsWindow.cxx

@@ -604,6 +604,10 @@ create_full_frame_buffer() {
 ////////////////////////////////////////////////////////////////////
 void TinyXGraphicsWindow::
 create_reduced_frame_buffer() {
+  if (!_full_frame_buffer) {
+     return;
+  }
+
   if (_reduced_frame_buffer != NULL) {
     ZB_close(_reduced_frame_buffer);
     _reduced_frame_buffer = NULL;