[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_krita/ui=3A_Merge_branch_=27krita-impro?=
From:       José_Luis_Vergara <pentalis () gmail ! com>
Date:       2011-06-30 20:39:10
Message-ID: 20110630203910.64354A60D3 () git ! kde ! org
[Download RAW message or body]

Git commit ce30e703fd8abdb54eef5b9840b3bfabab33fcac by José Luis Vergara.
Committed on 30/06/2011 at 22:32.
Pushed by jlvergara into branch 'master'.

Merge branch 'krita-improved_phong_bumpmap-pentalis'

Conflicts:
	krita/plugins/filters/phongbumpmap/phongbumpmap.cpp
	krita/ui/CMakeLists.txt

I  +3    -1    krita/plugins/filters/phongbumpmap/CMakeLists.txt     
I  +0    -56   krita/plugins/filters/phongbumpmap/constants.h     
I  +137  -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp     
I  +65   -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h     
I  +183  -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp     
I  +57   -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h     
I  +38   -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.cpp     
I  +33   -0    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.h     
I  +55   -0    krita/plugins/filters/phongbumpmap/phong_bumpmap_constants.h     
I  +1    -1    krita/plugins/filters/phongbumpmap/phong_pixel_processor.h     
I  +0    -428  krita/plugins/filters/phongbumpmap/phongbumpmap.cpp     
I  +0    -125  krita/plugins/filters/phongbumpmap/phongbumpmap.h     
MM +2    -0    krita/ui/CMakeLists.txt     
I  +344  -0    krita/ui/widgets/kis_light_source.cpp     
I  +88   -0    krita/ui/widgets/kis_light_source.h     
I  +255  -0    krita/ui/widgets/kis_light_stage.cpp     
I  +58   -0    krita/ui/widgets/kis_light_stage.h     

http://commits.kde.org/calligra/ce30e703fd8abdb54eef5b9840b3bfabab33fcac

diff --cc krita/ui/CMakeLists.txt
index 24e018d,d1615f4..da8ac78
--- a/krita/ui/CMakeLists.txt
+++ b/krita/ui/CMakeLists.txt
@@@ -165,7 -165,8 +165,9 @@@ set(kritaui_LIB_SRC
      widgets/kis_workspace_chooser.cpp
      widgets/squeezedcombobox.cpp
      widgets/kis_categorized_list_view.cpp
 +    widgets/kis_widget_chooser.cpp
+     widgets/kis_light_source.cpp
+     widgets/kis_light_stage.cpp
  )
  
  if(HAVE_OPENGL)


[prev in list] [next in list] [prev in thread] [next in thread]